PinePhone fix master repo

This MR fixes the PinePhone on the master repo by applying the same commits from the previous MR

I have confirmed this works. This requires merging so it can unblock the Master VM Image test failure

Fixes #605 (closed)