Merge "Adds the keyguard indication area overlays" into qt-dev