I believe this is the same core issue as this: Menu - Lock - Unlock doesn't redraw the original screen