Merge "Fix navigation bar in seascape in BackdropFrameRenderer" into nyc-mr1-dev am: 529319d81d
am: 2dbb93e41d

Change-Id: I72969ee42d7e0d50a87d9c8829d9f96f0ab8a91f