Merge "Fix fingerprint dialog icon color" into pi-dev am: 7c97601a43
am: c0e2681eb7

Change-Id: I28988c03d926167d0a753bd2b92642264a9579b8