Merge "Ensure that the keyguard container is always below message area." into sc-v2-dev