Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev