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

Change-Id: Ia4e59e195720919f2baa52e7d5667aed27c5ce7c