Merge "Add old methods back to prevent crash on old devices" into main