Merge "Fix lockdown button placement"