Merge "Don't reset to lift reveal - StatusBar will take care of that." into sc-dev