Merge \"Fix PIN screen title\" into nyc-mr1-dev
am: 79321c480f

Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9