Merge "SF: Activate display on boot and fold/unfold"