Merge "[automerger skipped] Merge "Show letterbox rounded corners behind navbar" into tm-qpr-dev am: 6f20d51b7a am: b1491547ee -s ours"