Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44 am: c150f5eb29
am: 4c95f60b9e

Change-Id: I651be252786c84156be901ef30f7cab37c1d4fdb