Merge "app: aboot: Fix unlocked state"