Merge "Fix letterbox for SCREEN_ORIENTATION_BEHIND" into tm-qpr-dev