Merge "Filter backup/restore confirmation buttons when obscured"