Merge branch '2926_screen_lib_flags'