Merge "Clear fixed rotation for app no longer changes rotation"